Fix the package scope of xfs_sr_on_hostA2 and xfs_sr_on_hostB1 - #547
Merged
Conversation
Member
|
Looks good to me. |
Member
Author
My mistake, I missed that it happens on separate hosts. |
glehmann
force-pushed
the
stormi/fix-xfs-fixture-scope
branch
from
May 22, 2026 15:43
2d25168 to
260c844
Compare
stormi
force-pushed
the
stormi/fix-xfs-fixture-scope
branch
from
May 26, 2026 17:01
260c844 to
eae4e4d
Compare
Member
It's the same old pytest bug, that requires importing package-scoped fixtures in the package's own conftest.py for the scope to be properly applied. This caused the fixture to be left alive across multiple packages that required it, closer to a session scope than to a package scope. Package-scoped fixtures moved to pkgfixtures.py and imported in each relevant package's conftest.py. Signed-off-by: Samuel Verschelde <stormi-xcp@ylix.fr>
This reverts commit e58c592. Signed-off-by: Gaëtan Lehmann <gaetan.lehmann@vates.tech>
This reverts commit 178bd4c. Signed-off-by: Gaëtan Lehmann <gaetan.lehmann@vates.tech>
stormi
force-pushed
the
stormi/fix-xfs-fixture-scope
branch
from
June 8, 2026 11:03
eae4e4d to
acf1a43
Compare
stormi
marked this pull request as ready for review
June 8, 2026 11:04
Member
Author
|
This PR is now ready for review. CC @glehmann @xcp-ng/storage. |
stormi
changed the title
glehmann
approved these changes
Jun 8, 2026
Wescoeur
approved these changes
Jun 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It's the same old pytest bug, that requires importing package-scoped fixtures in the package's own conftest.py for the scope to be properly applied.
This caused the fixture to be left alive across multiple packages that required it, closer to a session scope than to a package scope.
I moved the affected fixtures, as well as the other package-scoped fixtures they depend on, to
pkgfixtures.py, a file dedicated to storing package-level fixtures (instead of conftest.py) so that we don't accidentally forget to import them before using them.